23ab7f
@@ -312,6 +312,7 @@
private ASTNode genRewrittenTree(String rewrittenQuery) throws SemanticException
       throw new SemanticException(ErrorMsg.COLUMNSTATSCOLLECTOR_IO_ERROR.getMsg());
     }
     ctx.setCmd(rewrittenQuery);
+    ctx.setHDFSCleanup(true);
 
     try {
       return ParseUtils.parse(rewrittenQuery, ctx);
@@ -408,6 +409,7 @@
public void analyze(ASTNode ast, Context origCtx) throws SemanticException {
       analyzeRewrite.setColName(colNames);
       analyzeRewrite.setColType(colType);
       qbp.setAnalyzeRewrite(analyzeRewrite);
+      origCtx.addRewrittenStatementContext(ctx);
       initCtx(ctx);
       ctx.setExplainConfig(origCtx.getExplainConfig());
       LOG.info("Invoking analyze on rewritten query");
